Selaa lähdekoodia

修改入库详情表格供应商参数, 修改项目名称为成品出库

songw 1 kuukausi sitten
vanhempi
commit
bb49e284ff

+ 1 - 1
app/build.gradle

@@ -107,7 +107,7 @@ android {
                     def releaseInfo = getVersionName()
 //                    def timeR = new Date().format("yyyyMMdd_HH-mm-ss")
 //                    fileName = "行之成_产线UAS_RELEASE_${releaseInfo}_${timeR}.apk"
-                    fileName = "贾维斯_成品库_RELEASE_${releaseInfo}.apk"
+                    fileName = "贾维斯_成品库_RELEASE_${releaseInfo}.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
                     def timeD = new Date().format("yyyyMMdd_HH-mm-ss")

+ 2 - 0
app/src/main/java/uas/erp/jiaweisi_chengpinruku/activity/IndexActivity.java

@@ -230,6 +230,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             isPower = true;
         }else if (GloableParams.GRIDNAME_FINISHED_PRODUCT_STORAGE.equals(itemName)) {
             isPower = true;
+        }else if (GloableParams.GRIDNAME_FINISHED_PRODUCT_STORAGE2.equals(itemName)) {
+            isPower = true;
         }
         else if (powerList != null) {
             for (int i = 0; i < powerList.size(); i++) {

+ 3 - 2
app/src/main/java/uas/erp/jiaweisi_chengpinruku/fragment/NewJltStorageInFilterListFragment.java

@@ -163,7 +163,7 @@ public class NewJltStorageInFilterListFragment extends BaseFragment implements O
         mNumColumn = new Column<String>("单号", "PI_INOUTNO");
         mNumColumn.setFixed(true);
         mClassColumn = new Column<String>("类型", "PI_CLASS");
-        mSupplierColumn = new Column<String>("供应商", "PI_TITLE");
+        mSupplierColumn = new Column<String>("客户", "PI_TITLE");
         mWhcodeColumn = new Column<String>("仓库编号", "PI_WHCODE");
         mWhcodeDesColumn = new Column<String>("仓库名称", "PI_WHNAME");
         mStateColumn = new Column<String>("状态", "PI_STATUS");
@@ -359,7 +359,8 @@ public class NewJltStorageInFilterListFragment extends BaseFragment implements O
                                 jltStorageInBean.setPI_INOUTNO(FastjsonUtil.getText(dataObject, "PI_INOUTNO"));
                                 jltStorageInBean.setPI_ID(FastjsonUtil.getLong(dataObject, "PI_ID"));
                                 jltStorageInBean.setPI_CLASS(FastjsonUtil.getText(dataObject, "PI_CLASS"));
-                                jltStorageInBean.setPI_TITLE(FastjsonUtil.getText(dataObject, "PI_TITLE"));
+//                                jltStorageInBean.setPI_TITLE(FastjsonUtil.getText(dataObject, "PI_TITLE"));
+                                jltStorageInBean.setPI_TITLE(FastjsonUtil.getText(dataObject, "CU_NAME"));
                                 jltStorageInBean.setPI_WHCODE(FastjsonUtil.getText(dataObject, "PI_WHCODE"));
                                 jltStorageInBean.setPI_WHNAME(FastjsonUtil.getText(dataObject, "PI_WHNAME"));
                                 jltStorageInBean.setPI_STATUS(FastjsonUtil.getText(dataObject, "PI_STATUS"));

+ 1 - 1
app/src/main/java/uas/erp/jiaweisi_chengpinruku/global/GloableParams.java

@@ -767,7 +767,7 @@ public class GloableParams {
     public static final String GRIDNAME_OUT_STORAGE = "出库";
     public static final String GRIDNAME_STORAGE_MANAGER = "仓库管理";
 
-    public static final String GRIDNAME_FINISHED_PRODUCT_STORAGE2 = "成品库";   //单独的一个项目
+    public static final String GRIDNAME_FINISHED_PRODUCT_STORAGE2 = "成品库";   //单独的一个项目
     public static final String GRIDNAME_SETTING = "设置";
 
     public static String[] indexMainGridNames = {

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="my_app_name">贾维斯_成品库</string>
+    <string name="my_app_name">贾维斯_成品库</string>
     <string name="my_app_name_test">基于普耐尔WMS修改</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>

+ 2 - 2
build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 31,
             compileSdkVersion: 31,
             buildToolsVersion: "35.0.0",
-            versionCode      : 2,
-            versionName      : "1.0.1"
+            versionCode      : 3,
+            versionName      : "1.0.2"
     ]
 
     depsVersion = [