root
/
pda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ldj WMS

This commit is contained in:
bobwang 2024-03-06 20:44:57 +08:00
parent 0375490ad0
commit ff91693185
28 changed files with 2427 additions and 2022 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,2 +1,6 @@
/build /build
/gradle /gradle
caches
.idea
wrapper
/zhuike/release

14
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
View File

@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar" external-system-id="GRADLE">
<CLASSES>
<root url="jar://$PROJECT_DIR$/zhuike/caches/transforms-2/files-2.1/56ede792b4d5d35bc0bfecf8a6335973/espresso-core-3.0.2/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/zhuike/caches/transforms-2/files-2.1/56ede792b4d5d35bc0bfecf8a6335973/espresso-core-3.0.2/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/zhuike/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-core/3.0.2/137b6340c2f4bdfede28825af5ac3221f1ed9653/espresso-core-3.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/zhuike/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-core/3.0.2/433f4f601a3f3835691d80838dd7ff9414931b05/espresso-core-3.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>

14
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
View File

@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" external-system-id="GRADLE">
<CLASSES>
<root url="jar://$PROJECT_DIR$/zhuike/caches/transforms-2/files-2.1/d64cd6a0e7adff7b6eda2a8208a38745/espresso-idling-resource-3.0.2/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/zhuike/caches/transforms-2/files-2.1/d64cd6a0e7adff7b6eda2a8208a38745/espresso-idling-resource-3.0.2/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/zhuike/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-idling-resource/3.0.2/d4b16112a486446a92fc3dedce6b0d78ec57b09a/espresso-idling-resource-3.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/zhuike/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-idling-resource/3.0.2/6071e2b310c16836ba475a94df377e2f75928546/espresso-idling-resource-3.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>

14
.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
View File

@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test:monitor:1.0.2@aar" external-system-id="GRADLE">
<CLASSES>
<root url="jar://$PROJECT_DIR$/zhuike/caches/transforms-2/files-2.1/2cfe8a0e5d4da5865e21a36a41760baa/monitor-1.0.2/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/zhuike/caches/transforms-2/files-2.1/2cfe8a0e5d4da5865e21a36a41760baa/monitor-1.0.2/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/zhuike/caches/modules-2/files-2.1/com.android.support.test/monitor/1.0.2/6cc016eaa2b8a238607fe5fc20f27135bf8d7fd/monitor-1.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/zhuike/caches/modules-2/files-2.1/com.android.support.test/monitor/1.0.2/5764301056100b445e9ba31df7d1b554a55450f6/monitor-1.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>

14
.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
View File

@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test:runner:1.0.2@aar" external-system-id="GRADLE">
<CLASSES>
<root url="jar://$PROJECT_DIR$/zhuike/caches/transforms-2/files-2.1/fec7a4c0a3a3c0b2bd60e409a56dfb80/runner-1.0.2/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/zhuike/caches/transforms-2/files-2.1/fec7a4c0a3a3c0b2bd60e409a56dfb80/runner-1.0.2/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/zhuike/caches/modules-2/files-2.1/com.android.support.test/runner/1.0.2/493b6daca0eaa2f479bd6028d1754b6b7eecbd5a/runner-1.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/zhuike/caches/modules-2/files-2.1/com.android.support.test/runner/1.0.2/b2ce2342744a66e935dbc4a298259709a4c1f042/runner-1.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>

3
zhuike/build-scan-data/3.4.1/previous/1707226472865-40d55113-a98c-46dc-a6f3-d5734b2c440a/scan.properties
View File

@ -1,3 +0,0 @@
buildToolVersion=6.7.1
providedBuildId=lt6qb4qbsjfrlbhxhd4btqifiy
payloadSha512=7eCFQwEFEMaidKLl3oh8YKthGgMhv8XklyEbah6Iofy0oskr+fxlrQZ3WZ5o3SCHdg5A93obX/0pVpGj5QOLWA==

BIN
zhuike/build-scan-data/3.4.1/previous/1707226472865-40d55113-a98c-46dc-a6f3-d5734b2c440a/scan.scan
View File

Binary file not shown.

6
zhuike/build.gradle
View File

@ -23,8 +23,8 @@ android {
applicationId "com.deiniu.wms" applicationId "com.deiniu.wms"
minSdkVersion 19 //target 19 Android 4.4 以下版本仅占比4.1% minSdkVersion 19 //target 19 Android 4.4 以下版本仅占比4.1%
targetSdkVersion 33 targetSdkVersion 33
versionCode 88 versionCode 92
versionName "v1.88" versionName "v1.92"
// testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" // testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@ -37,7 +37,7 @@ android {
renderscriptSupportModeEnabled true //blurkit renderscriptSupportModeEnabled true //blurkit
multiDexEnabled true //突破65535 multiDexEnabled true //突破65535
// flavorDimensions "default" //debug时注销, 不然没有debug信息输出 // flavorDimensions "default" //debug时注销, 不然没有debug信息输出
} }
tasks.withType(JavaExec){ tasks.withType(JavaExec){
maxHeapSize="2g"; maxHeapSize="2g";

BIN
zhuike/daemon/6.7.1/registry.bin
View File

Binary file not shown.

BIN
zhuike/daemon/6.7.1/registry.bin.lock
View File

Binary file not shown.

4
zhuike/local.properties
View File

@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle. # Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the # For customization when using a Version Control System, please read the
# header note. # header note.
#Sat Feb 03 15:13:12 CST 2024 #Sun Mar 03 21:24:08 CST 2024
sdk.dir=D\:\\androidx\\sdk sdk.dir=D\:\\android\\sdk

4146
zhuike/proguard/class_files.txt
View File

File diff suppressed because it is too large Load Diff

2
zhuike/src/main/java/com/novelbook/android/Fragments/StockInSeedsOut2Fragment.java
View File

@ -562,7 +562,7 @@ int lastRadio =R.id.rdByCust;
if(validResult== Enums.enumValidInResult.成功){ if(validResult== Enums.enumValidInResult.成功){
Log.d(TAG, "onSuccess: to doGetStockPreInItem"); Log.d(TAG, "onSuccess: to doGetStockPreInItem");
if( chkPrint.isChecked() || connectBlueWeight(edSeedsCnt,getCurrentObj().getMinOperateUnit(),null)) { if( chkPrint.isChecked() || connectBlueWeight(edSeedsCnt,getCurrentObj().getMinOperateUnit(),null)) {
printStockInItem(getCurrentObj().getCustName(), getCurrentObj().getGoodsName(), map.get("batchCount"), getCurrentObj().getMinOperateUnit(), edFlowNo.getText().toString(), Enums.enumWhType.直通收货区.toString()); printStockInItem(getCurrentObj().getCustNameWithLineOrde(), getCurrentObj().getGoodsName(), map.get("batchCount"), getCurrentObj().getMinOperateUnit(), edFlowNo.getText().toString(), Enums.enumWhType.直通收货区.toString());
} }
doGetValidInDetail(); doGetValidInDetail();

17
zhuike/src/main/java/com/novelbook/android/Fragments/StockOutPickOneByOne.java
View File

@ -273,7 +273,7 @@ public class StockOutPickOneByOne extends BasicFragment {
productDate.setText(mStockOutPort().getProductDate()); productDate.setText(mStockOutPort().getProductDate());
validDate.setText(mStockOutPort().getValidDate()); validDate.setText(mStockOutPort().getValidDate());
batch.setText(mStockOutPort().getBatch()); batch.setText(mStockOutPort().getBatch());
tvCount.setText(mStockOutPort().getPcs()+""); tvCount.setText(mStockOutPort().getPcs()==0?mStockOutPort().getCount()+"" : mStockOutPort().getPcs()+"");
unit.setText(mStockOutPort().getUnit()); unit.setText(mStockOutPort().getUnit());
//packcnt.setText( mStockOutPort().getPcs() +""); //packcnt.setText( mStockOutPort().getPcs() +"");
packcnt.setText( mStockOutPort().getMinOperateCount() +""); packcnt.setText( mStockOutPort().getMinOperateCount() +"");
@ -833,12 +833,17 @@ public class StockOutPickOneByOne extends BasicFragment {
} }
} }
private void goSeeds() {
// if(!TextUtils.isEmpty(edFlowNo.getText().toString()))
{
( (Main2Activity)activity).showSeedsOut(edFlowNo.getText().toString());
}
boolean canBack;
private void goSeeds() {
if(canBack) {
popBack();
}else{
( (Main2Activity)activity).showSeedsOut(edFlowNo.getText().toString(),false);
}
canBack=!canBack;
} }
@Override @Override

22
zhuike/src/main/java/com/novelbook/android/Fragments/StockOutSeedsOutFragment.java
View File

@ -496,9 +496,15 @@ public class StockOutSeedsOutFragment extends BasicFragment {
} }
boolean canBack;
private void goPick() { private void goPick() {
((Main2Activity)activity).showStockOutSequence(edFlowFrom.getText().toString()); if(canBack) {
popBack();
}else{
((Main2Activity)activity).showStockOutSequence(edFlowFrom.getText().toString(),false);
}
canBack=!canBack;
} }
private void goLastPage() { private void goLastPage() {
@ -538,7 +544,7 @@ public class StockOutSeedsOutFragment extends BasicFragment {
BookSubscribe.seedsPickOut(map, BookSubscribe.seedsPickOut2(map,
new OnSuccessAndFaultSub(new OnSuccessAndFaultListener() { new OnSuccessAndFaultSub(new OnSuccessAndFaultListener() {
@Override @Override
public void onSuccess(String result) { public void onSuccess(String result) {
@ -553,7 +559,10 @@ public class StockOutSeedsOutFragment extends BasicFragment {
// boolean isPickSuccess = jsonObject.getBoolean("Data"); // boolean isPickSuccess = jsonObject.getBoolean("Data");
// Enums.enumOnShelfResult enumResult= Enums.enumOnShelfResult.valueOf(jsonObject.getString("Data")); // Enums.enumOnShelfResult enumResult= Enums.enumOnShelfResult.valueOf(jsonObject.getString("Data"));
failureMsg =jsonObject.getString("Data");
failureMsg =jsonObject.getString("Data");
if(failureMsg .equalsIgnoreCase("成功")){ if(failureMsg .equalsIgnoreCase("成功")){
if( chkPrint.isChecked() /*|| connectBlueWeight(edSeedsBulkCnt,ssd.getMinOperateUnit(),null) */){ if( chkPrint.isChecked() /*|| connectBlueWeight(edSeedsBulkCnt,ssd.getMinOperateUnit(),null) */){
Log.d(TAG, "to print ticket......................: "); Log.d(TAG, "to print ticket......................: ");
@ -561,6 +570,11 @@ public class StockOutSeedsOutFragment extends BasicFragment {
// printToBlue(ssd.getCustomerName(), ssd.getGoodsName(), map.get("seedCnt") + ssd.getUnit(), edFlowTo.getText().toString().trim(),MyApp.user.getEm_name() + " " + getFormatedDate(), // printToBlue(ssd.getCustomerName(), ssd.getGoodsName(), map.get("seedCnt") + ssd.getUnit(), edFlowTo.getText().toString().trim(),MyApp.user.getEm_name() + " " + getFormatedDate(),
// edFlowTo.getText().toString().trim()); // edFlowTo.getText().toString().trim());
//---- 可能货不足以扣除请求数量，所以，所以打印的数量以实际发生的为主 参考 outport id 10802 和 10803， 请求40 斤，实际第一次发生了10 斤，打印了40斤， 第二次发生了30 斤，又打印了30斤，共打印了70斤
//实际应该打印 10斤 和 30斤
float rs =Float.valueOf( jsonObject.getString("Message"));
printBox = (rs*100)/(mDatas.get(currentPage).getMinOperateCount()*100);
printToBlue(ssd.getCustomerName(), ssd.getGoodsName(), printBox+ " " +ssd.getMinOperateUnit(), edFlowTo.getText().toString().trim(),MyApp.user.getEm_name() + " " + getFormatedDate(), printToBlue(ssd.getCustomerName(), ssd.getGoodsName(), printBox+ " " +ssd.getMinOperateUnit(), edFlowTo.getText().toString().trim(),MyApp.user.getEm_name() + " " + getFormatedDate(),
edFlowTo.getText().toString().trim()); edFlowTo.getText().toString().trim());
} }

53
zhuike/src/main/java/com/novelbook/android/Fragments/StockPandianItem.java
View File

@ -53,6 +53,12 @@ public class StockPandianItem extends BasicFragment {
@BindView(R.id.tvUnit2) @BindView(R.id.tvUnit2)
TextView tvUnit2; TextView tvUnit2;
@BindView(R.id.tvUnit3)
TextView tvUnit3;
@BindView(R.id.tvPcount)
TextView tvPcount;
@BindView(R.id.tvCount) @BindView(R.id.tvCount)
TextView tvAvCnt; TextView tvAvCnt;
@ -151,17 +157,17 @@ public class StockPandianItem extends BasicFragment {
} }
String locId ;
@OnEditorAction({R.id.editPandianOrder,R.id.edLoc}) @OnEditorAction({R.id.editPandianOrder,R.id.edLoc})
boolean onEditorAction(KeyEvent key) { boolean onEditorAction(KeyEvent key) {
pandianResult =-1; pandianResult =-1;
if (!WmsUtil.isKeyEnterDown(key)) { if (!WmsUtil.isKeyEnterDown(key)) {
return true; return true;
} }
connectBlues();; // connectBlues();;
// doGetValidInDetail(); // doGetValidInDetail();
String locId = edLoc.getText().toString(); locId = edLoc.getText().toString();
if(mDatas.size()==0) { if(mDatas.size()==0) {
currentPage=0; currentPage=0;
doGetPandianTasks(locId); doGetPandianTasks(locId);
@ -181,8 +187,17 @@ public class StockPandianItem extends BasicFragment {
} }
} }
String shelf =mDatas.get(0).getLocationId().substring(0,8);
if(locId.startsWith(shelf)){
//当前shefl 任务里没有此loc的内容，则，新增记录
showNewPanItem(locId);
}else{
currentPage=0; currentPage=0;
doGetPandianTasks(locId); doGetPandianTasks(locId);
}
} }
return true; return true;
@ -307,6 +322,13 @@ public class StockPandianItem extends BasicFragment {
} }
@Override
public void onResume() {
super.onResume();
if(!TextUtils.isEmpty(locId))
doGetPandianTasks(locId);
}
@Override @Override
protected void initData() { protected void initData() {
@ -368,7 +390,7 @@ public class StockPandianItem extends BasicFragment {
private String lastCustId=""; private String lastCustId="";
private void setDetail() { private void setDetail() {
setTitle(title); setTitle(title);
btnAdd.setEnabled(false); // btnAdd.setEnabled(false);
if (mDatas.size() == 0) { if (mDatas.size() == 0) {
return; return;
} }
@ -377,7 +399,7 @@ public class StockPandianItem extends BasicFragment {
validInputStatus(ssd); validInputStatus(ssd);
tvLocationid.setText(ssd.getLocationId()); tvLocationid.setText(ssd.getLocationId());
btnAdd.setEnabled(false); // btnAdd.setEnabled(false);
edBulk.setEnabled(false); edBulk.setEnabled(false);
edBulk.setText(""); edBulk.setText("");
edPcs.setText(""); edPcs.setText("");
@ -414,6 +436,9 @@ public class StockPandianItem extends BasicFragment {
edPcs.setText(ssd.getPanPcs() > 0 ? ssd.getPanPcs() + "" : ""); edPcs.setText(ssd.getPanPcs() > 0 ? ssd.getPanPcs() + "" : "");
edBulk.setText(ssd.getPanBulks() > 0 ? ssd.getPanBulks() + "" : ""); edBulk.setText(ssd.getPanBulks() > 0 ? ssd.getPanBulks() + "" : "");
tvUnit2.setText(ssd.getUnit()); tvUnit2.setText(ssd.getUnit());
tvUnit3.setText(ssd.getUnit());
tvPcount.setText(ssd.getPcount());
// connectBlueWeight(edBulk,ssd.getMinOperateUnit(),null); // connectBlueWeight(edBulk,ssd.getMinOperateUnit(),null);
if (ssd.getPanPcs() + ssd.getPanBulks() == 0) { if (ssd.getPanPcs() + ssd.getPanBulks() == 0) {
@ -451,11 +476,18 @@ public class StockPandianItem extends BasicFragment {
break; break;
case R.id.btnAdd: case R.id.btnAdd:
PanddianTarget ssd = getCurrentObj(); showNewPanItem(locId);
((Main2Activity)activity).showNewPandianItem(ssd.getOrderNo(), ssd.getLocationId(),ssd.getId(),ssd.getType()==2,ssd.getGoodsId());
break; break;
} }
} }
void showNewPanItem(String locId){
PanddianTarget ssd = getCurrentObj();
((Main2Activity)activity).showNewPandianItem(ssd.getOrderNo(), locId,ssd.getId(),ssd.getType()==2,ssd.getGoodsId());
}
int lastRadio =R.id.rdByCust; int lastRadio =R.id.rdByCust;
private void switchRadio(int rd) { private void switchRadio(int rd) {
if(lastRadio!=rd){ if(lastRadio!=rd){
@ -508,7 +540,7 @@ int lastRadio =R.id.rdByCust;
tvLocationid .setText( ""); tvLocationid .setText( "");
setInfo("");; setInfo("");;
setFailureMsg(""); setFailureMsg("");
btnAdd.setEnabled(false); // btnAdd.setEnabled(false);
} }
@Override @Override
protected void initViews() { protected void initViews() {
@ -561,6 +593,7 @@ int lastRadio =R.id.rdByCust;
doPandianItem(map);; doPandianItem(map);;
edLoc.requestFocus();
} }
@ -607,10 +640,12 @@ int lastRadio =R.id.rdByCust;
try { try {
return (Float.valueOf(edPcs.getText().toString()) /weightRate )* Float.valueOf(getCurrentObj().getBigCount()) float f = (Float.valueOf(edPcs.getText().toString()) /weightRate )* Float.valueOf(getCurrentObj().getMinOperateCount())
+(Float.valueOf(edBulk.getText().toString())) +(Float.valueOf(edBulk.getText().toString()))
; ;
return f;
}catch (Exception er){ }catch (Exception er){
} }

1
zhuike/src/main/java/com/novelbook/android/Fragments/StockPandianItemNew_fragment.java
View File

@ -189,6 +189,7 @@ public class StockPandianItemNew_fragment extends BasicFragment {
if( stkItem==null){ if( stkItem==null){
return false; return false;
} }
locatationId=edLocation.getText().toString().trim();
if(TextUtils.isEmpty((locatationId) )|| TextUtils.isEmpty((pandianOrder))){ if(TextUtils.isEmpty((locatationId) )|| TextUtils.isEmpty((pandianOrder))){
return false; return false;
} }

36
zhuike/src/main/java/com/novelbook/android/Main2Activity.java
View File

@ -177,8 +177,12 @@ public class Main2Activity extends Activity_blue
} }
String currentActiveFragment;
private void showFragment(Fragment fragment, String fragmentTag) private void showFragment(Fragment fragment, String fragmentTag)
{
showFragment(fragment,fragmentTag,true);
}
String currentActiveFragment;
private void showFragment(Fragment fragment, String fragmentTag,boolean isAddToBackStack )
{ {
setInfo(""); setInfo("");
FragmentManager fm = getSupportFragmentManager(); FragmentManager fm = getSupportFragmentManager();
@ -189,6 +193,8 @@ public class Main2Activity extends Activity_blue
ft.replace(R.id.realtabcontent, fragment,fragmentTag); ft.replace(R.id.realtabcontent, fragment,fragmentTag);
//if(!fragmentTag.equalsIgnoreCase("StockOutSeedsOutFragment"))
// if(isAddToBackStack)
ft.addToBackStack(null); //add to backstack. ft.addToBackStack(null); //add to backstack.
@ -204,6 +210,8 @@ public class Main2Activity extends Activity_blue
currentActiveFragment =fragmentTag; currentActiveFragment =fragmentTag;
// ft.setTransition(2500);//TRANSIT_FRAGMENT_OPEN // ft.setTransition(2500);//TRANSIT_FRAGMENT_OPEN
// ft.setTransition(isAddToBackStack?FragmentTransaction.TRANSIT_FRAGMENT_OPEN: FragmentTransaction.TRANSIT_NONE);
ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN); ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
ft.commitAllowingStateLoss(); ft.commitAllowingStateLoss();
@ -691,13 +699,13 @@ public void popBackFragment(){
case 408://下架任务 case 408://下架任务
// showTakeOutTaskByloc(); // showTakeOutTaskByloc();
showStockOutSequence(""); showStockOutSequence("",true);
break; break;
//StockOutTasksAssignByLocation //StockOutTasksAssignByLocation
case 420://播种出库 case 420://播种出库
showSeedsOut(""); break; showSeedsOut("",true); break;
case 430://亮灯拣货 case 430://亮灯拣货
showStockLightJob(); break; showStockLightJob(); break;
case 440://分拣记录 case 440://分拣记录
@ -789,13 +797,22 @@ public void popBackFragment(){
showFragment(fragment , StockGoodsMaintain_fragment.TAG); showFragment(fragment , StockGoodsMaintain_fragment.TAG);
} }
public void showSeedsOut(String flowNo ) { public void showSeedsOut(String flowNo ,boolean isAddToBackStack) {
StockOutSeedsOutFragment fragment = (StockOutSeedsOutFragment) getSupportFragmentManager() StockOutSeedsOutFragment fragment = (StockOutSeedsOutFragment) getSupportFragmentManager()
.findFragmentByTag(StockOutSeedsOutFragment.TAG); .findFragmentByTag(StockOutSeedsOutFragment.TAG);
if(fragment ==null) fragment =new StockOutSeedsOutFragment(); if(fragment ==null) fragment =new StockOutSeedsOutFragment();
fragment.setTitleName(getAuth().getAuth_name()); fragment.setTitleName(getAuth().getAuth_name());
fragment.setFlowNo(flowNo); fragment.setFlowNo(flowNo);
showFragment(fragment , StockOutSeedsOutFragment.TAG); showFragment(fragment , StockOutSeedsOutFragment.TAG,isAddToBackStack);
}
public void showStockOutSequence(String flowNo,boolean isAddToBackStack) {
StockOutPickOneByOne fragment = (StockOutPickOneByOne) getSupportFragmentManager()
.findFragmentByTag(StockOutPickOneByOne.TAG);
if(fragment ==null) fragment =new StockOutPickOneByOne();
fragment.setTitleName(getAuth().getAuth_name());
fragment.setFlowNo(flowNo);
showFragment(fragment , StockOutPickOneByOne.TAG,isAddToBackStack);
} }
/* private void showStockInSeedsOut() { /* private void showStockInSeedsOut() {
@ -909,14 +926,7 @@ public void popBackFragment(){
fragment.setTitleName(getAuth().getAuth_name()); fragment.setTitleName(getAuth().getAuth_name());
showFragment(fragment , StockOutPickFragment.TAG); showFragment(fragment , StockOutPickFragment.TAG);
} }
public void showStockOutSequence(String flowNo) {
StockOutPickOneByOne fragment = (StockOutPickOneByOne) getSupportFragmentManager()
.findFragmentByTag(StockOutPickOneByOne.TAG);
if(fragment ==null) fragment =new StockOutPickOneByOne();
fragment.setTitleName(getAuth().getAuth_name());
fragment.setFlowNo(flowNo);
showFragment(fragment , StockOutPickOneByOne.TAG);
}
private void showStockLightSeeds() { private void showStockLightSeeds() {
StockLightSeeds fragment = (StockLightSeeds) getSupportFragmentManager() StockLightSeeds fragment = (StockLightSeeds) getSupportFragmentManager()

4
zhuike/src/main/java/com/novelbook/android/bean/OnShelfTask.java
View File

@ -32,7 +32,7 @@ public class OnShelfTask
private String pickByName; private String pickByName;
private String onShelfTime; private String onShelfTime;
private int bigCount; private float bigCount;
private float box; private float box;
private int state; private int state;
@ -60,7 +60,7 @@ public class OnShelfTask
return onShelfTime; return onShelfTime;
} }
public int getBigCount() { public float getBigCount() {
return bigCount; return bigCount;
} }

15
zhuike/src/main/java/com/novelbook/android/bean/PanddianTarget.java
View File

@ -149,7 +149,7 @@ public class PanddianTarget {
return 0; return 0;
} }
return (int)( cnt/unit ); return (int)( (cnt*100)/(unit *100));
}catch (Exception e){ }catch (Exception e){
Log.d("pandiantargetitem", "getPcs: " +e); Log.d("pandiantargetitem", "getPcs: " +e);
} }
@ -168,12 +168,17 @@ public class PanddianTarget {
float cnt = Float.valueOf(pcount); float cnt = Float.valueOf(pcount);
float unit = Float.valueOf(minOperateCount); float unit = Float.valueOf(minOperateCount);
if(this.minOperateUnit .equalsIgnoreCase("斤")){
if(unit==1){ return cnt;
return (int)(cnt/unit) * unit;
} }
return (cnt - (int)(cnt/unit) * unit );
if(unit==1 ){
return (int)((cnt*100)/(unit*100)) * unit;
}
return (cnt - (int)( (cnt*100)/(unit*100) ) * unit );
}catch (Exception e){ }catch (Exception e){
Log.d("pandiantargetitem", "getPcs: " +e); Log.d("pandiantargetitem", "getPcs: " +e);
} }

12
zhuike/src/main/java/com/novelbook/android/bean/StockInDetailPackBarcode.java
View File

@ -44,6 +44,13 @@ public class StockInDetailPackBarcode {
private float seeded; private float seeded;
private float orderCount; private float orderCount;
private int linePriority;
private int lineOrder;
public String getLineOrder (){
return (linePriority >10?linePriority/10:linePriority )+ "--" + lineOrder;
}
public String getMinOperateUnit() { public String getMinOperateUnit() {
return minOperateUnit; return minOperateUnit;
} }
@ -160,6 +167,11 @@ public class StockInDetailPackBarcode {
return custName; return custName;
} }
public String getCustNameWithLineOrde() {
return custName + " " + getLineOrder();
}
public void setCustName(String custName) { public void setCustName(String custName) {
this.custName = custName; this.custName = custName;
} }

1
zhuike/src/main/java/com/novelbook/android/bean/StockOutPort.java
View File

@ -106,6 +106,7 @@ public class StockOutPort {
} }
public int getPcs() { public int getPcs() {
return (int)pcs; return (int)pcs;
} }

8
zhuike/src/main/java/com/novelbook/android/netapi/HttpApi.java
View File

@ -268,7 +268,13 @@ public interface HttpApi {
@POST("stockOut/seedsPickOut")//stockOut/seedsPickOut(string flowNo,int outDetailId,decimal seedCnt) @POST("stockOut/seedsPickOut")//stockOut/seedsPickOut(string flowNo,int outDetailId,decimal seedCnt)
Observable<ResponseBody> seedsPickOut( @Body Map<String, String> map); Observable<ResponseBody> seedsPickOut( @Body Map<String, String> map);
//Observable<ResponseBody> upValidImage(@Part("preNo") String preNo ,@Part("purch_d_id") int purch_d_id ,@Part("description") String description, @Part MultipartBody.Part file);
@POST("stockOut/seedsPickOut2")//stockOut/seedsPickOut2(string flowNo,int outDetailId,decimal seedCnt)
Observable<ResponseBody> seedsPickOu2( @Body Map<String, String> map);
//Observable<ResponseBody> upValidImage(@Part("preNo") String preNo ,@Part("purch_d_id") int purch_d_id ,@Part("description") String description, @Part MultipartBody.Part file);
@Multipart @Multipart
// @FormUrlEncoded // @FormUrlEncoded
@POST("upValidImage/{preNo}/{goodsId}") //upValidImage(string preNo,int purch_d_id, string description,Stream fileContent); @POST("upValidImage/{preNo}/{goodsId}") //upValidImage(string preNo,int purch_d_id, string description,Stream fileContent);

8
zhuike/src/main/java/com/novelbook/android/netsubscribe/BookSubscribe.java
View File

@ -349,6 +349,14 @@ public class BookSubscribe {
HttpMethods.getInstance().toSubscribe(observable, subscriber); HttpMethods.getInstance().toSubscribe(observable, subscriber);
} }
public static void seedsPickOut2(Map<String, String> map, DisposableObserver<ResponseBody> subscriber){
Observable<ResponseBody> observable = HttpMethods.getInstance("seedsPickOut2").getHttpApi().
seedsPickOu2(map );
HttpMethods.getInstance().toSubscribe(observable, subscriber);
}
public static void initialStockIn(Map<String, String> map, DisposableObserver<ResponseBody> subscriber){ public static void initialStockIn(Map<String, String> map, DisposableObserver<ResponseBody> subscriber){
Observable<ResponseBody> observable = HttpMethods.getInstance("initialStockIn").getHttpApi(). Observable<ResponseBody> observable = HttpMethods.getInstance("initialStockIn").getHttpApi().
initialStockIn(map ); initialStockIn(map );

2
zhuike/src/main/java/com/novelbook/android/netutils/OnSuccessAndFaultSub.java
View File

@ -211,7 +211,7 @@ public class OnSuccessAndFaultSub extends DisposableObserver<ResponseBody>
JSONObject jsonObject = new JSONObject(result); JSONObject jsonObject = new JSONObject(result);
if(!jsonObject.has("Code")){ if(!jsonObject.has("Code")){ //{"goodsMaintainResult":{"Code":0,"Data":"True","Message":""}}
JSONObject rsObj; JSONObject rsObj;
Iterator keys = jsonObject.keys(); Iterator keys = jsonObject.keys();
while(keys.hasNext()) { while(keys.hasNext()) {

4
zhuike/src/main/res/layout/fragment_stock_out_seeds_out.xml
View File

@ -47,7 +47,7 @@ android:padding="3dp"
android:id="@+id/rdByGoods" android:id="@+id/rdByGoods"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checked="true"
android:text="@string/seedsBygoods"> android:text="@string/seedsBygoods">
</RadioButton> </RadioButton>
@ -56,7 +56,7 @@ android:padding="3dp"
android:id="@+id/rdByCust" android:id="@+id/rdByCust"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checked="true"
android:text="@string/seedsByCust"> android:text="@string/seedsByCust">
</RadioButton> </RadioButton>

44
zhuike/src/main/res/layout/fragment_stock_pandian_item.xml
View File

@ -112,7 +112,7 @@ android:padding="3dp"
<TextView <TextView
android:id="@+id/tvLocationId" android:id="@+id/tvLocationId"
style="@style/TextViewValue.bold" style="@style/TextViewValue.bold"
android:textSize="22sp" android:textSize="18sp"
android:text=" " /> android:text=" " />
@ -195,12 +195,14 @@ android:padding="3dp"
<TextView <TextView
style="@style/TextViewTitle" style="@style/TextViewTitle"
android:visibility="gone"
android:text="@string/MinOperationUnit" /> android:text="@string/MinOperationUnit" />
<TextView <TextView
android:id="@+id/tvMinOperationUnit3" android:id="@+id/tvMinOperationUnit3"
android:layout_weight="0" android:layout_weight="0"
android:layout_width="wrap_content" android:layout_width="wrap_content"
style="@style/TextViewValue" style="@style/TextViewValue"
android:visibility="gone"
android:text=" " /> android:text=" " />
@ -221,23 +223,57 @@ android:padding="3dp"
android:text="@string/loccount" /> android:text="@string/loccount" />
<TextView <TextView
android:id="@+id/tvCount" android:id="@+id/tvCount"
android:layout_weight="2"
style="@style/TextViewValue" style="@style/TextViewValue"
android:layout_width="wrap_content"
android:text=" " /> android:text=" " />
<TextView <TextView
style="@style/TextViewTitle" style="@style/TextViewTitle"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone"
android:text="@string/unit" /> android:text="@string/unit" />
<TextView <TextView
android:id="@+id/tvunit" android:id="@+id/tvunit"
android:layout_weight="0"
android:layout_width="wrap_content" android:layout_width="wrap_content"
style="@style/TextViewValue" style="@style/TextViewValue"
android:paddingLeft="10dp"
android:text=" " /> android:text=" " />
</LinearLayout> </LinearLayout>
<LinearLayout
style="@style/llView"
>
<TextView
style="@style/TextViewTitle"
android:text="@string/pcount" />
<TextView
android:id="@+id/tvPcount"
android:layout_weight="0"
style="@style/TextViewValue.bold"
android:layout_width="wrap_content"
android:text="0" />
<TextView
style="@style/TextViewTitle"
android:layout_height="match_parent"
android:visibility="gone"
android:text="@string/unit" />
<TextView
android:id="@+id/tvUnit3"
android:layout_weight="0"
android:layout_width="wrap_content"
style="@style/TextViewValue"
android:paddingLeft="10dp"
android:text=" " />
</LinearLayout>

1
zhuike/src/main/res/values/strings.xml
View File

@ -373,5 +373,6 @@
<string name="validtime">验收时间</string> <string name="validtime">验收时间</string>
<string name="goSeeds">分播</string> <string name="goSeeds">分播</string>
<string name="goPick">去下架</string> <string name="goPick">去下架</string>
<string name="pcount">盘点数量</string>
</resources> </resources>